bitkeeper revision 1.1159.187.13 (41a6082272nwAioGViThlz6Of26a3g)
authormafetter@fleming.research <mafetter@fleming.research>
Thu, 25 Nov 2004 16:28:18 +0000 (16:28 +0000)
committermafetter@fleming.research <mafetter@fleming.research>
Thu, 25 Nov 2004 16:28:18 +0000 (16:28 +0000)
Merge maf46@ssh-relay1.cl.cam.ac.uk:/usr/groups/netos/xeno/BK/xen-2.0-testing.bk
into fleming.research:/scratch/fleming/mafetter/foo


Trivial merge